<!DOCTYPE html><html lang="zh-CN" data-theme="light"><head><meta charset="UTF-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1.0,viewport-fit=cover"><title>学习笔记 | 学习笔记</title><meta name="author" content="lzoxun"><meta name="copyright" content="lzoxun"><meta name="format-detection" content="telephone=no"><meta name="theme-color" content="#ffffff"><meta name="description" content="---  title: gitee + svn项目创建 码云(gitee)创建私有仓库 进入管理-启用 svn 服务，就能通过 svn 方式管理仓库 下载 进入 Apache 官网 -&gt; Subversion -&gt; 找到 Binary Packages 下载可以的包 -&gt; VisualSVN -&gt; 下载安装 tools 搭建服务器的话还要下载 Visual SVN Serv">
<meta property="og:type" content="article">
<meta property="og:title" content="学习笔记">
<meta property="og:url" content="http://example.com/2023/07/22/other/other-svn/index.html">
<meta property="og:site_name" content="学习笔记">
<meta property="og:description" content="---  title: gitee + svn项目创建 码云(gitee)创建私有仓库 进入管理-启用 svn 服务，就能通过 svn 方式管理仓库 下载 进入 Apache 官网 -&gt; Subversion -&gt; 找到 Binary Packages 下载可以的包 -&gt; VisualSVN -&gt; 下载安装 tools 搭建服务器的话还要下载 Visual SVN Serv">
<meta property="og:locale" content="zh_CN">
<meta property="og:image" content="https://i.loli.net/2021/02/24/5O1day2nriDzjSu.png">
<meta property="article:published_time" content="2023-07-22T07:14:09.685Z">
<meta property="article:modified_time" content="2023-07-22T07:14:09.685Z">
<meta property="article:author" content="lzoxun">
<meta name="twitter:card" content="summary">
<meta name="twitter:image" content="https://i.loli.net/2021/02/24/5O1day2nriDzjSu.png"><link rel="shortcut icon" href="/img/favicon.png"><link rel="canonical" href="http://example.com/2023/07/22/other/other-svn/index.html"><link rel="preconnect" href="//cdn.jsdelivr.net"/><link rel="preconnect" href="//busuanzi.ibruce.info"/><link rel="stylesheet" href="/css/index.css"><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free/css/all.min.css" media="print" onload="this.media='all'"><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/node-snackbar/dist/snackbar.min.css" media="print" onload="this.media='all'"><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fancyapps/ui/dist/fancybox/fancybox.min.css" media="print" onload="this.media='all'"><script>const GLOBAL_CONFIG = {
  root: '/',
  algolia: undefined,
  localSearch: {"path":"/search.xml","preload":true,"top_n_per_article":1,"unescape":true,"languages":{"hits_empty":"找不到您查询的内容：${query}","hits_stats":"共找到 ${hits} 篇文章"}},
  translate: {"defaultEncoding":2,"translateDelay":0,"msgToTraditionalChinese":"繁","msgToSimplifiedChinese":"簡"},
  noticeOutdate: undefined,
  highlight: {"plugin":"highlighjs","highlightCopy":true,"highlightLang":true,"highlightHeightLimit":false},
  copy: {
    success: '复制成功',
    error: '复制错误',
    noSupport: '浏览器不支持'
  },
  relativeDate: {
    homepage: false,
    post: false
  },
  runtime: '',
  dateSuffix: {
    just: '刚刚',
    min: '分钟前',
    hour: '小时前',
    day: '天前',
    month: '个月前'
  },
  copyright: undefined,
  lightbox: 'fancybox',
  Snackbar: {"chs_to_cht":"你已切换为繁体","cht_to_chs":"你已切换为简体","day_to_night":"你已切换为深色模式","night_to_day":"你已切换为浅色模式","bgLight":"#49b1f5","bgDark":"#1f1f1f","position":"bottom-left"},
  source: {
    justifiedGallery: {
      js: 'https://cdn.jsdelivr.net/npm/flickr-justified-gallery/dist/fjGallery.min.js',
      css: 'https://cdn.jsdelivr.net/npm/flickr-justified-gallery/dist/fjGallery.min.css'
    }
  },
  isPhotoFigcaption: false,
  islazyload: true,
  isAnchor: false,
  percent: {
    toc: true,
    rightside: false,
  },
  autoDarkmode: false
}</script><script id="config-diff">var GLOBAL_CONFIG_SITE = {
  title: '学习笔记',
  isPost: true,
  isHome: false,
  isHighlightShrink: false,
  isToc: true,
  postUpdate: '2023-07-22 15:14:09'
}</script><noscript><style type="text/css">
  #nav {
    opacity: 1
  }
  .justified-gallery img {
    opacity: 1
  }

  #recent-posts time,
  #post-meta time {
    display: inline !important
  }
</style></noscript><script>(win=>{
    win.saveToLocal = {
      set: function setWithExpiry(key, value, ttl) {
        if (ttl === 0) return
        const now = new Date()
        const expiryDay = ttl * 86400000
        const item = {
          value: value,
          expiry: now.getTime() + expiryDay,
        }
        localStorage.setItem(key, JSON.stringify(item))
      },

      get: function getWithExpiry(key) {
        const itemStr = localStorage.getItem(key)

        if (!itemStr) {
          return undefined
        }
        const item = JSON.parse(itemStr)
        const now = new Date()

        if (now.getTime() > item.expiry) {
          localStorage.removeItem(key)
          return undefined
        }
        return item.value
      }
    }
  
    win.getScript = url => new Promise((resolve, reject) => {
      const script = document.createElement('script')
      script.src = url
      script.async = true
      script.onerror = reject
      script.onload = script.onreadystatechange = function() {
        const loadState = this.readyState
        if (loadState && loadState !== 'loaded' && loadState !== 'complete') return
        script.onload = script.onreadystatechange = null
        resolve()
      }
      document.head.appendChild(script)
    })
  
    win.getCSS = (url,id = false) => new Promise((resolve, reject) => {
      const link = document.createElement('link')
      link.rel = 'stylesheet'
      link.href = url
      if (id) link.id = id
      link.onerror = reject
      link.onload = link.onreadystatechange = function() {
        const loadState = this.readyState
        if (loadState && loadState !== 'loaded' && loadState !== 'complete') return
        link.onload = link.onreadystatechange = null
        resolve()
      }
      document.head.appendChild(link)
    })
  
      win.activateDarkMode = function () {
        document.documentElement.setAttribute('data-theme', 'dark')
        if (document.querySelector('meta[name="theme-color"]') !== null) {
          document.querySelector('meta[name="theme-color"]').setAttribute('content', '#0d0d0d')
        }
      }
      win.activateLightMode = function () {
        document.documentElement.setAttribute('data-theme', 'light')
        if (document.querySelector('meta[name="theme-color"]') !== null) {
          document.querySelector('meta[name="theme-color"]').setAttribute('content', '#ffffff')
        }
      }
      const t = saveToLocal.get('theme')
    
          const now = new Date()
          const hour = now.getHours()
          const isNight = hour <= 6 || hour >= 18
          if (t === undefined) isNight ? activateDarkMode() : activateLightMode()
          else if (t === 'light') activateLightMode()
          else activateDarkMode()
        
      const asideStatus = saveToLocal.get('aside-status')
      if (asideStatus !== undefined) {
        if (asideStatus === 'hide') {
          document.documentElement.classList.add('hide-aside')
        } else {
          document.documentElement.classList.remove('hide-aside')
        }
      }
    
    const detectApple = () => {
      if(/iPad|iPhone|iPod|Macintosh/.test(navigator.userAgent)){
        document.documentElement.classList.add('apple')
      }
    }
    detectApple()
    })(window)</script><meta name="generator" content="Hexo 6.3.0"></head><body><div id="loading-box"><div class="loading-left-bg"></div><div class="loading-right-bg"></div><div class="spinner-box"><div class="configure-border-1"><div class="configure-core"></div></div><div class="configure-border-2"><div class="configure-core"></div></div><div class="loading-word">加载中...</div></div></div><script>(()=>{
  const $loadingBox = document.getElementById('loading-box')
  const $body = document.body
  const preloader = {
    endLoading: () => {
      $body.style.overflow = ''
      $loadingBox.classList.add('loaded')
    },
    initLoading: () => {
      $body.style.overflow = 'hidden'
      $loadingBox.classList.remove('loaded')
    }
  }

  preloader.initLoading()
  window.addEventListener('load',() => { preloader.endLoading() })

  if (false) {
    document.addEventListener('pjax:send', () => { preloader.initLoading() })
    document.addEventListener('pjax:complete', () => { preloader.endLoading() })
  }
})()</script><div id="sidebar"><div id="menu-mask"></div><div id="sidebar-menus"><div class="avatar-img is-center"><img src= "" data-lazy-src="https://i.loli.net/2021/02/24/5O1day2nriDzjSu.png" onerror="onerror=null;src='/img/friend_404.gif'" alt="avatar"/></div><div class="sidebar-site-data site-data is-center"><a href="/archives/"><div class="headline">文章</div><div class="length-num">108</div></a><a href="/tags/"><div class="headline">标签</div><div class="length-num">1</div></a><a href="/categories/"><div class="headline">分类</div><div class="length-num">0</div></a></div><hr class="custom-hr"/><div class="menus_items"><div class="menus_item"><a class="site-page" href="/"><i class="fa-fw fas fa-home"></i><span> 首页</span></a></div><div class="menus_item"><a class="site-page" href="/archives/"><i class="fa-fw fas fa-archive"></i><span> 归档</span></a></div><div class="menus_item"><a class="site-page" href="/tags/"><i class="fa-fw fas fa-tags"></i><span> 标签</span></a></div></div></div></div><div class="post" id="body-wrap"><header class="post-bg" id="page-header"><nav id="nav"><span id="blog-info"><a href="/" title="学习笔记"><span class="site-name">学习笔记</span></a></span><div id="menus"><div id="search-button"><a class="site-page social-icon search" href="javascript:void(0);"><i class="fas fa-search fa-fw"></i><span> 搜索</span></a></div><div class="menus_items"><div class="menus_item"><a class="site-page" href="/"><i class="fa-fw fas fa-home"></i><span> 首页</span></a></div><div class="menus_item"><a class="site-page" href="/archives/"><i class="fa-fw fas fa-archive"></i><span> 归档</span></a></div><div class="menus_item"><a class="site-page" href="/tags/"><i class="fa-fw fas fa-tags"></i><span> 标签</span></a></div></div><div id="toggle-menu"><a class="site-page" href="javascript:void(0);"><i class="fas fa-bars fa-fw"></i></a></div></div></nav><div id="post-info"><h1 class="post-title">无题</h1><div id="post-meta"><div class="meta-firstline"><span class="post-meta-date"><i class="far fa-calendar-alt fa-fw post-meta-icon"></i><span class="post-meta-label">发表于</span><time class="post-meta-date-created" datetime="2023-07-22T07:14:09.685Z" title="发表于 2023-07-22 15:14:09">2023-07-22</time><span class="post-meta-separator">|</span><i class="fas fa-history fa-fw post-meta-icon"></i><span class="post-meta-label">更新于</span><time class="post-meta-date-updated" datetime="2023-07-22T07:14:09.685Z" title="更新于 2023-07-22 15:14:09">2023-07-22</time></span></div><div class="meta-secondline"><span class="post-meta-separator">|</span><span class="post-meta-pv-cv" id="" data-flag-title=""><i class="far fa-eye fa-fw post-meta-icon"></i><span class="post-meta-label">阅读量:</span><span id="busuanzi_value_page_pv"><i class="fa-solid fa-spinner fa-spin"></i></span></span></div></div></div></header><main class="layout" id="content-inner"><div id="post"><article class="post-content" id="article-container"><pre><code>---
</code></pre>
<h2 id="title-gitee-svn"><a href="#title-gitee-svn" class="headerlink" title="title: gitee + svn"></a>title: gitee + svn</h2><h2 id="项目创建"><a href="#项目创建" class="headerlink" title="项目创建"></a>项目创建</h2><ul>
<li>码云(gitee)创建私有仓库</li>
<li>进入管理-启用 svn 服务，就能通过 svn 方式管理仓库</li>
<li>下载<ul>
<li>进入 <a target="_blank" rel="noopener" href="https://subversion.apache.org/roadmap.html#release-planning">Apache 官网</a> -&gt; Subversion -&gt; 找到 Binary Packages 下载可以的包 -&gt; VisualSVN -&gt; 下载安装 tools</li>
<li>搭建服务器的话还要下载 <code>Visual SVN Server</code></li>
<li><a target="_blank" rel="noopener" href="https://tortoisesvn.net/sasl_howto.html">https://tortoisesvn.net/sasl_howto.html</a></li>
</ul>
</li>
<li>层级<ul>
<li>客户层<ul>
<li>通过命令行操作</li>
<li>通过工具操作</li>
</ul>
</li>
<li>服务层<ul>
<li>通过<code>(DAV)http://</code>方式访问远程仓库<ul>
<li>需要永远<code>Apache</code>服务器</li>
</ul>
</li>
<li>通过<code>(SVN)svn://</code>方式访问远程仓库</li>
<li>通过<code>(Local)file://</code>方式访问仓库(搭建 SVN 仓库本机，不需要网络)</li>
</ul>
</li>
<li>仓库层</li>
</ul>
</li>
</ul>
<h3 id="SVN-命令行"><a href="#SVN-命令行" class="headerlink" title="SVN 命令行"></a>SVN 命令行</h3><ul>
<li><p>管理员命令</p>
<ul>
<li>svnadmin –help</li>
<li>svnadmin –help 命令</li>
<li>仓库<ul>
<li>顶级仓库 (顶级仓库下管理着很多根仓库)<ul>
<li>一个文件夹,创建根仓库时，根仓库路径中上一层必须存在，这个就是顶层参考</li>
</ul>
</li>
<li>根仓库<ul>
<li><code>svnadmin create path</code> :创建版本根仓库<ul>
<li><code>conf</code>: 根仓库配置文件夹<ul>
<li><code>authz</code>:权限文件<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br><span class="line">2</span><br><span class="line">3</span><br><span class="line">4</span><br><span class="line">5</span><br><span class="line">6</span><br><span class="line">7</span><br><span class="line">8</span><br><span class="line">9</span><br><span class="line">10</span><br><span class="line">11</span><br><span class="line">12</span><br><span class="line">13</span><br><span class="line">14</span><br><span class="line">15</span><br><span class="line">16</span><br><span class="line">17</span><br><span class="line">18</span><br><span class="line">19</span><br><span class="line">20</span><br><span class="line">21</span><br><span class="line">22</span><br><span class="line">23</span><br></pre></td><td class="code"><pre><span class="line">[groups]</span><br><span class="line"><span class="meta prompt_"># </span><span class="language-bash">定义leaders、members两个组</span> </span><br><span class="line">leaders = user1,user2</span><br><span class="line">members = user3,user4,user5</span><br><span class="line"><span class="meta prompt_"></span></span><br><span class="line"><span class="meta prompt_"># </span><span class="language-bash">通过组设置权限，组中成员都有这个权限</span></span><br><span class="line">[/thank/sms2] # 对于sms2目录</span><br><span class="line">@leaders = rw </span><br><span class="line">@members = r</span><br><span class="line">* = </span><br><span class="line"><span class="meta prompt_"></span></span><br><span class="line"><span class="meta prompt_"># </span><span class="language-bash">不使用组</span></span><br><span class="line">[/] # 对于根仓库（realm指定的）（rw,r, ）只有这三种值</span><br><span class="line">用户1 = rw # 用户1拥有读写权限</span><br><span class="line">用户2 = r  # 用户2只有读权限</span><br><span class="line">* = #其他用户每一任何权限</span><br><span class="line"></span><br><span class="line">[/thank/sms] #对于指定目录</span><br><span class="line">...</span><br><span class="line">...</span><br><span class="line">...</span><br><span class="line"><span class="meta prompt_"></span></span><br><span class="line"><span class="meta prompt_"># </span><span class="language-bash">这边权限优先级高于svnserve.conf设置的</span></span><br></pre></td></tr></table></figure></li>
<li><code>passwd</code> 是帐号密码文件<ul>
<li>用户1 &#x3D; 密码1</li>
<li>用户2 &#x3D; 密码2</li>
</ul>
</li>
<li><code>svnserve.conf</code> 是 SVN 服务配置文件<ul>
<li>打开下面的5个注释</li>
<li>anon-access &#x3D; read #匿名用户可读(write读写权限)</li>
<li>auth-access &#x3D; write #授权用户可读写</li>
<li>password-db &#x3D; passwd #使用哪个文件作为账号文件</li>
<li>authz-db &#x3D; authz #使用哪个文件作为权限文件</li>
<li>realm &#x3D; &#x2F;home&#x2F;svn # 认证空间名，版本库所在目录</li>
</ul>
</li>
</ul>
</li>
<li><code>db</code>:存放具体版本数据内容(不是源码)</li>
</ul>
</li>
</ul>
</li>
</ul>
</li>
</ul>
</li>
<li><p>服务端命令</p>
<ul>
<li>svnserve</li>
<li>svnserve -d：开启 svn 服务，开放顶层仓库，运行客户端访问</li>
<li>svnserve -d –listen-port&#x3D;8888(默认 3690)<ul>
<li>通过<code>svn://localhost:3690/path/顶层仓库/跟仓库</code>访问</li>
</ul>
</li>
<li>svnserve -d –listen-port&#x3D;8888 -r &#x2F;home&#x2F;lzoxun&#x2F;svnrepository ：指定顶层仓库<ul>
<li>通过<code>svn://localhost:3690/跟仓库</code>访问</li>
</ul>
</li>
</ul>
</li>
<li><p>客户端命令</p>
<ul>
<li><p>命令指令直接管理（有些指令不支持）</p>
<ul>
<li><p>检出：<code>svn checkout(co) svn://gitee.com/lzo-gitee/lzo-svnmsg 指定co到的路径</code></p>
</li>
<li><p>提交</p>
<ul>
<li><p>状态：<code>svn status(st)</code></p>
<ul>
<li><p>状态值</p>
<ul>
<li>A - svn add filename</li>
<li>M - 内容修改过的文件</li>
<li>L - 锁定的文件(svn cleanup 处理)</li>
<li>K - 加锁的文件</li>
<li>? - 未跟踪</li>
</ul>
</li>
<li><p><code>svn add filename</code>:将文件或目录交给 svn 进行管理。每个文件只能 add 一次</p>
</li>
<li><p><code>svn status -v path</code>:并查看子文件状态</p>
</li>
</ul>
</li>
<li><p>提交：<code>svn commit(ci) -m &#39;LogMessage&#39; 提交的文件</code> (提交所以 add 和已修改的文件)</p>
<ul>
<li>提交文件服务仓库无法直接看到的</li>
</ul>
</li>
</ul>
</li>
<li><p>更新</p>
<ul>
<li><code>svn update(up)</code> ：如果后面没有目录，默认将当前目录以及子目录下的所有文件都更新到最新版本。</li>
<li><code>svn update -r 200 test.php</code>： 将版本库中的文件 test.php 还原到版本 200</li>
</ul>
</li>
<li><p>比较</p>
<ul>
<li><code>svn diff(di) path</code>：将修改的文件与基础版本比较</li>
<li><code>svn diff -r m:n path</code>：对版本 m 和版本 n 比较差异</li>
</ul>
</li>
<li><p>删除</p>
<ul>
<li><code>svn delete path</code><ul>
<li><code>svn commit -m &#39;delfilepath&#39; path</code></li>
<li>svn (del, remove, rm)</li>
</ul>
</li>
</ul>
</li>
<li><p>查看</p>
<ul>
<li>查看日志:<code>svn log path</code></li>
<li>文件信息:<code>svn file path</code></li>
</ul>
</li>
<li><p>合并</p>
<ul>
<li><code>svn merge -r m:n path</code>:合并 m 版本与 n 版本</li>
</ul>
</li>
<li><p>锁</p>
<ul>
<li>作用避免冲突<ul>
<li>将文件加锁，拥有锁的用户可以修改，不拥有锁的用户对于该文件是只读的，当修改完，将锁释放，其他用户才能修改，这样就不会产生冲突了(匿名用户无法获取锁，有锁的文件图标变灰色)</li>
</ul>
</li>
<li>加锁:<code>svn lock -m &quot;LockMessage&quot; PATH</code></li>
<li>解锁:<code>svn unlock PATH</code></li>
</ul>
</li>
<li><p>问题</p>
<ul>
<li><code>svn: Cannot negotiate authentication mechanism</code>（无法协商认证机制）。<ul>
<li>svn 服务器开启了 sasl 加密，本地的 Xcode 和命令行中的 svn 不支持 sasl 加密导致无法协商认证机制问题</li>
<li>升级:高版本自带 sasl</li>
</ul>
</li>
</ul>
</li>
<li><p>不常用指令</p>
<ul>
<li><code>svn list(ls)</code>:查看文件列表</li>
<li><code>svn mkdir Path</code>:直接创建纳入版本库(Add 状态)的文件夹<ul>
<li><code>svn mkdir Url -m &#39;msg&#39;</code>:直接 commit 到远程(中间目录必须存在,<code>result error</code>)</li>
</ul>
</li>
<li><code>svn cleanup</code>:清除预留日志<ul>
<li>svn 操作文件之前默认将数据备份到日志文件中，操作结束自动删除，操作过程被打断，就会遗留</li>
<li>它搜索你的工作副本并执行所有遗留的日志，在这过程中删除锁。如果 Subversion 曾告诉你你的工作副本的一部分被“锁定”了，那么你应该执行这个命令。另外， svn status 会在锁定的项前显示 L。</li>
</ul>
</li>
<li><code>import</code>：<ul>
<li>将本地文件导入到源码库中，通常用于第一次上传让服务器生成代码项目，以后还需要上传则是 commit</li>
<li><code>svn import /e/lzo-project/git-test svn://gitee.com/lzo-gitee/lzo-svnmsg/testdir -m &#39;msg&#39;</code></li>
</ul>
</li>
<li><code>svn revert</code>:撤销本地修改<ul>
<li><code>svn revert fileName</code>:撤销单个文件</li>
<li><code>svn revert ./*</code>:撤销当前文件夹下所有修改</li>
<li><code>svn revert -R ./*</code>:递归撤销当前文件夹下所有修改</li>
</ul>
</li>
</ul>
</li>
<li><p>log module</p>
</li>
<li><p>tag module</p>
</li>
<li><p>分支 module</p>
</li>
</ul>
</li>
</ul>
</li>
</ul>
<h3 id="TortoiseSVN"><a href="#TortoiseSVN" class="headerlink" title="TortoiseSVN"></a>TortoiseSVN</h3><ul>
<li>安装<ul>
<li>TortoiseSVN（前面下载 svn 的地方，VisualSVN 同级）</li>
<li>Language packs 语言包</li>
</ul>
</li>
<li>win 下载安装 TortoiseSVN（Subversion ）<ul>
<li>检出:复制仓库地址，右键检出(checkout)，输入 gitee 的账号密码</li>
</ul>
</li>
<li>操作<ul>
<li>window del 删除可以用ctrl+z撤销，有件通过svn的delete就需要svn的revert撤销</li>
<li>回滚<ul>
<li>右键 svn功能列表 <code>Update to revision...</code></li>
<li>客户方你日通回滚到指定版本，再次提交就是接下去的，回滚的版本不会消失</li>
</ul>
</li>
<li>冲突<ul>
<li>当一个文件在多个客户端同时修改，第一个客户端进行提交，没有问题，能成功提交到服务端,第二个用户在进行修改提交，就会产生冲突，</li>
<li>具体类型<ul>
<li>异行修改<ul>
<li>两个用户修改文件内容不是同一行，svn可以进行简单的合并，双方修改都起作用</li>
<li>第二个用户提交的时候，当前版本比服务器的低(第一个人修改提交版本加一)，会提示先更新，然后在提交，可以直接提交成功</li>
</ul>
</li>
<li>同行修改<ul>
<li>两个用户修改文件内容是同一行</li>
<li>需要人工进行冲突内容的选择,由人工完成取舍</li>
<li>第二位修改用户提交的时候得到提示需要先更新，这时候会出现好的个文件，和带感叹号标识的冲突文件<ul>
<li>三个文件代表：自己修改的，修改之前版本和前一个人提交之后的版本(我修改之前版本的下一版本)  <figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br><span class="line">2</span><br><span class="line">3</span><br><span class="line">4</span><br><span class="line">5</span><br><span class="line">6</span><br><span class="line">7</span><br><span class="line">8</span><br><span class="line">9</span><br></pre></td><td class="code"><pre><span class="line">1111111111</span><br><span class="line">&lt;&lt;&lt;&lt;&lt;&lt;&lt; .mine</span><br><span class="line">我修改的内容</span><br><span class="line">||||||| .r7</span><br><span class="line">我修改之前,的内容</span><br><span class="line">=======</span><br><span class="line">第一人修改的内容</span><br><span class="line"><span class="meta prompt_">&gt;</span><span class="language-bash">&gt;&gt;&gt;&gt;&gt; .r8</span></span><br><span class="line">1111111111</span><br></pre></td></tr></table></figure></li>
</ul>
</li>
<li>人工删除不需要的，在删除多余的文件，提交解决冲突</li>
<li>冲突感叹号文件右键 Edit conflict 使用svn提供的窗口合并<ul>
<li>黄色代表冲突的行</li>
<li>红色代表冲突的内容 </li>
<li>一个窗格是第一个人提交的内容及版本，一个窗口是自己的修改</li>
<li>在？？？？的窗格中选择行，右键选择用谁的</li>
</ul>
</li>
</ul>
</li>
</ul>
</li>
</ul>
</li>
</ul>
</li>
</ul>
<h3 id="对比-git"><a href="#对比-git" class="headerlink" title="对比 git"></a>对比 git</h3><ul>
<li>集中式</li>
<li>修改不需要 add,新文件才要 add<ul>
<li>git 修改也要 add 或者 commit -am</li>
</ul>
</li>
<li>commit 后不需要 push，直接提交到远程</li>
</ul>
<h3 id="vscode"><a href="#vscode" class="headerlink" title="vscode"></a>vscode</h3><figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br><span class="line">2</span><br></pre></td><td class="code"><pre><span class="line">&quot;svn.path&quot;: &quot;C:\\Program Files\\TortoiseSVN\\bin\\TortoiseSVN.exe&quot;,</span><br><span class="line">&quot;TortoiseSVN.tortoiseSVNProcExePath&quot;: &quot;C:\\Program Files\\TortoiseSVN\\bin\\TortoiseProc.exe&quot;,</span><br></pre></td></tr></table></figure>
<h2 id="注意事项"><a href="#注意事项" class="headerlink" title="注意事项"></a>注意事项</h2><p><a target="_blank" rel="noopener" href="https://gitee.com/help/articles/4131#article-header0">资料</a></p>
</article><div class="post-copyright"><div class="post-copyright__author"><span class="post-copyright-meta">文章作者: </span><span class="post-copyright-info"><a href="http://example.com">lzoxun</a></span></div><div class="post-copyright__type"><span class="post-copyright-meta">文章链接: </span><span class="post-copyright-info"><a href="http://example.com/2023/07/22/other/other-svn/">http://example.com/2023/07/22/other/other-svn/</a></span></div><div class="post-copyright__notice"><span class="post-copyright-meta">版权声明: </span><span class="post-copyright-info">本博客所有文章除特别声明外，均采用 <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/" target="_blank">CC BY-NC-SA 4.0</a> 许可协议。转载请注明来自 <a href="http://example.com" target="_blank">学习笔记</a>！</span></div></div><div class="tag_share"><div class="post-meta__tag-list"></div><div class="post_share"><div class="social-share" data-image="https://i.loli.net/2021/02/24/5O1day2nriDzjSu.png" data-sites="facebook,twitter,wechat,weibo,qq"></div><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/butterfly-extsrc/sharejs/dist/css/share.min.css" media="print" onload="this.media='all'"><script src="https://cdn.jsdelivr.net/npm/butterfly-extsrc/sharejs/dist/js/social-share.min.js" defer></script></div></div><nav class="pagination-post" id="pagination"><div class="prev-post pull-left"><a href="/2023/07/22/other/other-postmain/" title="postmain"><div class="cover" style="background: var(--default-bg-color)"></div><div class="pagination-info"><div class="label">上一篇</div><div class="prev_info">postmain</div></div></a></div><div class="next-post pull-right"><a href="/2023/07/22/other/other-systemtype/" title="业务系统"><div class="cover" style="background: var(--default-bg-color)"></div><div class="pagination-info"><div class="label">下一篇</div><div class="next_info">业务系统</div></div></a></div></nav></div><div class="aside-content" id="aside-content"><div class="card-widget card-info"><div class="is-center"><div class="avatar-img"><img src= "" data-lazy-src="https://i.loli.net/2021/02/24/5O1day2nriDzjSu.png" onerror="this.onerror=null;this.src='/img/friend_404.gif'" alt="avatar"/></div><div class="author-info__name">lzoxun</div><div class="author-info__description"></div></div><div class="card-info-data site-data is-center"><a href="/archives/"><div class="headline">文章</div><div class="length-num">108</div></a><a href="/tags/"><div class="headline">标签</div><div class="length-num">1</div></a><a href="/categories/"><div class="headline">分类</div><div class="length-num">0</div></a></div><a id="card-info-btn" target="_blank" rel="noopener" href="https://github.com/liaozhongxun"><i class="fab fa-github"></i><span>Follow Me</span></a><div class="card-info-social-icons is-center"><a class="social-icon" href="https://github.com/liaozhongxun" target="_blank" title="Github"><i class="fab fa-github" style="color: #24292e;"></i></a><a class="social-icon" href="mailto:869664233@gmail.com" target="_blank" title="Email"><i class="fas fa-envelope" style="color: #4a7dbe;"></i></a></div></div><div class="card-widget card-announcement"><div class="item-headline"><i class="fas fa-bullhorn fa-shake"></i><span>公告</span></div><div class="announcement_content">这是我的文档</div></div><div class="sticky_layout"><div class="card-widget" id="card-toc"><div class="item-headline"><i class="fas fa-stream"></i><span>目录</span><span class="toc-percentage"></span></div><div class="toc-content"><ol class="toc"><li class="toc-item toc-level-2"><a class="toc-link" href="#title-gitee-svn"><span class="toc-number">1.</span> <span class="toc-text">title: gitee + svn</span></a></li><li class="toc-item toc-level-2"><a class="toc-link" href="#%E9%A1%B9%E7%9B%AE%E5%88%9B%E5%BB%BA"><span class="toc-number">2.</span> <span class="toc-text">项目创建</span></a><ol class="toc-child"><li class="toc-item toc-level-3"><a class="toc-link" href="#SVN-%E5%91%BD%E4%BB%A4%E8%A1%8C"><span class="toc-number">2.1.</span> <span class="toc-text">SVN 命令行</span></a></li><li class="toc-item toc-level-3"><a class="toc-link" href="#TortoiseSVN"><span class="toc-number">2.2.</span> <span class="toc-text">TortoiseSVN</span></a></li><li class="toc-item toc-level-3"><a class="toc-link" href="#%E5%AF%B9%E6%AF%94-git"><span class="toc-number">2.3.</span> <span class="toc-text">对比 git</span></a></li><li class="toc-item toc-level-3"><a class="toc-link" href="#vscode"><span class="toc-number">2.4.</span> <span class="toc-text">vscode</span></a></li></ol></li><li class="toc-item toc-level-2"><a class="toc-link" href="#%E6%B3%A8%E6%84%8F%E4%BA%8B%E9%A1%B9"><span class="toc-number">3.</span> <span class="toc-text">注意事项</span></a></li></ol></div></div><div class="card-widget card-recent-post"><div class="item-headline"><i class="fas fa-history"></i><span>最新文章</span></div><div class="aside-list"><div class="aside-list-item no-cover"><div class="content"><a class="title" href="/2023/07/22/window/win-11/" title="win 11 set">win 11 set</a><time datetime="2023-07-22T07:14:09.700Z" title="发表于 2023-07-22 15:14:09">2023-07-22</time></div></div><div class="aside-list-item no-cover"><div class="content"><a class="title" href="/2023/07/22/window/win-gitbash/" title="git bash">git bash</a><time datetime="2023-07-22T07:14:09.700Z" title="发表于 2023-07-22 15:14:09">2023-07-22</time></div></div><div class="aside-list-item no-cover"><div class="content"><a class="title" href="/2023/07/22/window/win-wsl/" title="wsl">wsl</a><time datetime="2023-07-22T07:14:09.700Z" title="发表于 2023-07-22 15:14:09">2023-07-22</time></div></div><div class="aside-list-item no-cover"><div class="content"><a class="title" href="/2023/07/22/window/win-main/" title="window">window</a><time datetime="2023-07-22T07:14:09.700Z" title="发表于 2023-07-22 15:14:09">2023-07-22</time></div></div><div class="aside-list-item no-cover"><div class="content"><a class="title" href="/2023/07/22/web/%E5%85%BC%E5%AE%B9%E9%97%AE%E9%A2%98/" title="兼容问题">兼容问题</a><time datetime="2023-07-22T07:14:09.699Z" title="发表于 2023-07-22 15:14:09">2023-07-22</time></div></div></div></div></div></div></main><footer id="footer"><div id="footer-wrap"><div class="copyright">&copy;2020 - 2023 By lzoxun</div><div class="framework-info"><span>框架 </span><a target="_blank" rel="noopener" href="https://hexo.io">Hexo</a><span class="footer-separator">|</span><span>主题 </span><a target="_blank" rel="noopener" href="https://github.com/jerryc127/hexo-theme-butterfly">Butterfly</a></div></div></footer></div><div id="rightside"><div id="rightside-config-hide"><button id="readmode" type="button" title="阅读模式"><i class="fas fa-book-open"></i></button><button id="translateLink" type="button" title="简繁转换">繁</button><button id="darkmode" type="button" title="浅色和深色模式转换"><i class="fas fa-adjust"></i></button><button id="hide-aside-btn" type="button" title="单栏和双栏切换"><i class="fas fa-arrows-alt-h"></i></button></div><div id="rightside-config-show"><button id="rightside_config" type="button" title="设置"><i class="fas fa-cog fa-spin"></i></button><button class="close" id="mobile-toc-button" type="button" title="目录"><i class="fas fa-list-ul"></i></button><button id="go-up" type="button" title="回到顶部"><span class="scroll-percent"></span><i class="fas fa-arrow-up"></i></button></div></div><div><script src="/js/utils.js"></script><script src="/js/main.js"></script><script src="/js/tw_cn.js"></script><script src="https://cdn.jsdelivr.net/npm/@fancyapps/ui/dist/fancybox/fancybox.umd.min.js"></script><script src="https://cdn.jsdelivr.net/npm/instant.page/instantpage.min.js" type="module"></script><script src="https://cdn.jsdelivr.net/npm/vanilla-lazyload/dist/lazyload.iife.min.js"></script><script src="https://cdn.jsdelivr.net/npm/node-snackbar/dist/snackbar.min.js"></script><script>function panguFn () {
  if (typeof pangu === 'object') pangu.autoSpacingPage()
  else {
    getScript('https://cdn.jsdelivr.net/npm/pangu/dist/browser/pangu.min.js')
      .then(() => {
        pangu.autoSpacingPage()
      })
  }
}

function panguInit () {
  if (false){
    GLOBAL_CONFIG_SITE.isPost && panguFn()
  } else {
    panguFn()
  }
}

document.addEventListener('DOMContentLoaded', panguInit)</script><div class="js-pjax"></div><script id="canvas_nest" defer="defer" color="0,0,255" opacity="0.7" zIndex="-1" count="99" mobile="false" src="https://cdn.jsdelivr.net/npm/butterfly-extsrc/dist/canvas-nest.min.js"></script><script async data-pjax src="//busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js"></script><div id="local-search"><div class="search-dialog"><nav class="search-nav"><span class="search-dialog-title">搜索</span><span id="loading-status"></span><button class="search-close-button"><i class="fas fa-times"></i></button></nav><div class="is-center" id="loading-database"><i class="fas fa-spinner fa-pulse"></i><span>  数据库加载中</span></div><div class="search-wrap"><div id="local-search-input"><div class="local-search-box"><input class="local-search-box--input" placeholder="搜索文章" type="text"/></div></div><hr/><div class="no-result" id="local-search-results"></div><div id="local-search-stats-wrap"></div></div></div><div id="search-mask"></div><script src="/js/search/local-search.js"></script></div></div><script src="/live2dw/lib/L2Dwidget.min.js?094cbace49a39548bed64abff5988b05"></script><script>L2Dwidget.init({"pluginRootPath":"live2dw/","pluginJsPath":"lib/","pluginModelPath":"assets/","tagMode":false,"log":false,"model":{"jsonPath":"/live2dw/assets/haruto.model.json"},"display":{"position":"right","width":100,"height":200,"right":300},"mobile":{"show":true}});</script></body></html>